Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Abort instead of panic on asserting intrinsics #1239

Merged
merged 3 commits into from
Mar 18, 2020

Conversation

elichai
Copy link
Contributor

@elichai elichai commented Mar 18, 2020

This fixes #1222
replacing the panic with an abort and a corresponding message.
the stack trace is already printed, this just adds an optional message the caller can pass, and I just pass the same message we passed to the panic but now to the abort instead.

r? @RalfJung

src/machine.rs Outdated Show resolved Hide resolved
src/shims/intrinsics.rs Outdated Show resolved Hide resolved
src/diagnostics.rs Outdated Show resolved Hide resolved
src/diagnostics.rs Outdated Show resolved Hide resolved
@RalfJung
Copy link
Member

RalfJung commented Mar 18, 2020

I edited your original message to say "fixes #1222" (not "solves") so that GH will close that issue automatically when the PR gets merged.

@RalfJung
Copy link
Member

Looking good, thanks. :)
@bors r+

@bors
Copy link
Collaborator

bors commented Mar 18, 2020

📌 Commit 0826899 has been approved by RalfJung

@bors
Copy link
Collaborator

bors commented Mar 18, 2020

⌛ Testing commit 0826899 with merge 6b56aef...

@bors
Copy link
Collaborator

bors commented Mar 18, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing 6b56aef to master...

@bors bors merged commit 6b56aef into rust-lang:master Mar 18, 2020
@elichai elichai deleted the 2020-03-abort-intrinsics branch March 18, 2020 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Abort in "assert_*" intrinsics
3 participants